bugfixes for new definition files