Fix discoverd Watch usage