Fix more strict errors.