fixes of integration code for e020 (not complete, untested)