Some fixes for 2.2; now it passes system test