Minor changes on address/coordinates