Added some fixes for GPS