Fix some custom types.