More 3.1 changes