Basedir fixup