Fix m2e integration