Patched up some more holes in the bit fields.