More normalization of IDs
Satisfy `pub publish` requirements