Additional fixes for broker spec