SavegameInitFix & Waypoint.DrawPackage