Little fixes in IOT and system monitor