Fixes for BISERVER-8409 and BISERVER-8412