Fixes for location arrival, push for grade