Fixing missed otypes assignments;