Bitfield fixes