router: fixes
portal: fixes
sensor: fixes