Fixed a couple of type bugs.