Fix compile issues in pull request 223