internal location fixes