few cherrypick error corrections