Fix default values and concurrency issues