Minor Fixes
Minor Fixes