Fix known concurrency issues