Fix directory issues