BISERVER-8659 - fixed compile errors