BISERVER-8223 - Fix compilation errors
Merge pull request #150 from rmansoor/master

BISERVER-8223- Fixed compilation errors