Minor fixes and MonitorControlTest (not finish yet)