Fix timeouts in map watch.