Bug Fixes

Fixed bugs