small fixes for rabbitmq support