Fixes for waypoint giving ammy & Staff rush quests