Got rid of some 1.6/1.7 inconsistencies