Moar map fixes.
#2615, #2614 and DAMN TUBES