Some more minor changes for EJB 3.2 support