File location tweaks