Fixed some minor type-os