fix compilation errors caused by pull request merge