Make still more changes to fix eventual consistency problem