Small bitfield fixes