Minor fixes for bitfield/enum