fix some problems with ID definitions, which will hopefully fix the build bots.