Fix some JMS2 spec issues