Fix Msg4 for mac subheader long, RB calculation improvement, and fix variable types to support bigger payload lengths