Fix gps problems

Change-Id: Ieef19e475e64c7bbd047d9c098c21ac1c3b2e29d