Fixes for Custom Folders