More Minor changes