More 1.7 changes.