Minor logging cleanup
Added some fixes for Multibroker environments