Additional bug fixes
Fixing bugs