[Mac] More path fixes after bundle structure change