Type spec fix

Cleans up a couple type-specs