EJBMaker and fixes to DAOMaker