fix code that depended on the old JEOS structure and older Oz