Bug fixes
Fixing bugs