More tweaks to help with path setting