Fixing metadata rb includes