Fix bitfields