Exploratory tweaks to solve concurrency issues