Fix byte math, unused fields.