JMS2 fixes from Andy