Fix Plumbing Issues

Fix Plumbing Issues