some concurrency tweaks