Bug fixes
Corrections