101 more 1.7 errors fixed