Some fixes, need to be completed on GPS frag