more nits to get concurrency right