Bug fixes
Commit