Fix to get broker oo-admin tests passing