Various routing key fixes