Minor tweaks
Minor changes