Bug fixes
Merge