Resolve issues to make pullreview happy