Fixing directory issues