Few minor location tweaks