Merge "fix some bugs in monitor"