Fix BitSet size issue for or, perf improvments