Resolving more 1.7 errors.