Some EJB TCK fixes