Main hall waypoint tweaks