EJB client schema fix & cleanup

Lets pick as many as we like (see changes per commit).