Bugfixes with called races and new synonyms