More strict equality comparison operator fixes