Fixed a few bugs in `or` implementation