Fix GPXPoint, minor clean-ups