Fix the directory problems actually.