Fixes for definition files.