Fix remaining 1.7 errors.