More 1.10 changes