Merge "Fixing small folder bugs"