Various changes
Minor changes.