A few cleanups, small concurrency bug fixes for recently introduced stuff