Some changes to ease GPS integration