Minor consistency fixes with bitmask class