More fix-ups for 3.4