A few more fixes
Deprecated BitSet and BitArray