Partial fix for required folders