Tidy up a bit, change to 1.7.