Fixed some directory issues