M2e related fixes
2 files changed