Minor changes and temporary fix for non-working pipes