More 1.7 changes, almost there