fix(types): address type incompatibilities, regen types

fix(types): address type incompatibilities, regen types #377