Fix some more things.