More 1.4.2 fixup