Fixed minor issues
Minor changes