Minor fixes
Fix for concurrent updates.