Minor bug fixes
Minor Bugs Fixing