mq fixes