More path fixup