Bug fixes
Merged