Fix some metadata passing.