Fix possible errors due to mirage
Merge remote-tracking branch 'cmbq/cmbq' into cmbq