More MQ Fixes