Remove *Compat fields, and add reserved UIDs