fixes to tautological-compare warnings