More IdGenerator fixes