issue fixed
Minor fixes