A few more fixes before the final 2.10