QPID integration improvements.