fixes for to not use JPAContainerFactory
other minor fixes