stability fixes for the address broker