misc: fixing the build
Merge pull request #152 from rareddy/8.4.x

misc: fixing the build