Fixed more wrong directory issues