Fix some compilation errors due to the switch to long character IDs