Fixed a few more type definition related compile errors.