BISERVER-9514 - Fixed compile errors