Fix comp warnings