Merge "Fixing a couple folder bugs"