Fixes bugs for integration with MON module