Fixing problems with metadata folder