Fix error reporting
Expand type synonyms