Fix some devices_status handling