Fixed a few type-os