Incremental changes
Fixes for concurrent update.