2.x compatibility fixes, tests are borked for now