Fixed certain cherry picking issues.