fix up build errors when using m2e;