more app_location fixes