More tweaks for 3.2 compat

Test suite now passes