Minor fix to location stuff