BISERVER-8223- Fixed compilation errors