Some Bug Fixes
Some Bug Fixes