Bug fixes
Minor Bug Fixes