Improve more typespecs