scripts: fixed cherry-pick remnants