small fixes in rabbitmq message processing