Fix a couple of types in the spec