Fix idempotent start/stop