Minor Fixes
Minor modifications