Compile fixes for GPS rename