5.6.2 fixes, all 5.6 tests pass now