Fix GPS fix
Strengthen build barrier