fix build errors after pull request merge