Final set of fixups for 3.4