Fix more comp warnings