Fix most breakage under 3.3/3.4