Fix current dir issues