A few tweaks to folder creation