various cleanups to the jms support