Type Object fixes

When I did my "git pull upstream master", these two changes to Type
Object were not included for some reason, so I am committing them so
that my files match up with the current versions.