Minor changes here and there
Minor changes here and there