Even more 3.1 changes