Slight fix for chrome issue, and waypoint test.