More bugfixing-- fixes "sis/bro" test, working on Java client regression.