Fixed some concurrent operations,