[MAP] Aran's pipe fixes

http://i.imgur.com/lSBxpJz.png