Make batch updates work