Location support, fixes