More path munging