Few Building/waypoint tweaks