Basic plumbing fixes