fix build errors
Merge pull request #3035 from xabbuh/fix-build-errors-2.3

fix build errors