Fix some more keys