Some more changes to take into account EJB 3.2 version