Fix some metadata stuff