Fixed directory problems