Various changes for 2.9