A few more fixes for 2.9.1