Fix current folder issues