More folder tweaks