Fix up temp destination handling in AMQP