Concurrent: Fix bugs