Some Minor changes