Fixup paths