Bug Fixes
Fixing bugs