Bug Fixes

Fixing Bugs