Exercise Plumbing fixes