Minor fixes
Minor Fixed