Fixing some directory issues