fixups in move to 4.5.0: