Re-add path munging