Fixes for JMS and Doctrine stuff