Minor fixes, including concurrency fixes