some 4.3 fixups