Bug fixes
Merge conflict