Fix type synonyms issue