First 1.7 updates