Minor Fixes
Minor Changes