Tighten some sleep times and fix a concurrency bug