More strict comparison operator changes