Fixed errors related to "cherry-pick"