MQ & Lobster fixes