Fixing more pipes