Another shot at fixing metadata