Fixed some more GPS related bugs