Fixes for JMS support.