[Core] More path shenanigans