Few minor fixes
Minor fix