More tweaks to path checks