Fix all 1.7 errors