Fix some bugs with the cfb1 bitsize handling