Waypoint and Minion Tweaks