concurrrency fixes