Clean-up location fixes