Fix Plumbing Problems

Fix Plumbing Problems