More fixes.
Fixed tags and env instrucitons for MOM.