LevelDB changes
After merge conflicts