Fixes for new correlations and adding RabbitMQ host to config