MB-9840 misc fixes