GPS class access fixes