Fixed a couple of type errors