Synonym(more) fixes