[Misc] Fix some small folder-related things