Fixes bugs for integration with MON module

Signed-off-by: diazb <bdiaz@whitestack.com>
16 files changed