Fix Throw & Type entries