More performance tweaks for folders.