Improve some typespecs