Improvements to location procedures