Fixing general folders