Yet more MQ changes