Minor changes
Minor fixes