Fixed warnings about deprecated 'or' operators