Minor fix on lat/lon and something else