[BISERVER-10656] Various Fixes