Driver fix data generate error, tweaks