Fixed directory issues