Fixed some dir issuses