Integrate monitor with MAC
Fix compiling error.