- Fix Folder constructor calls
- Fix bug in sorting lists