More geo loc fixes