Fixes some metadata issues