Fixes for swapped byte bitfields