Fixed typespecs