Fix some more types

[none]