Some minor mods
Minor mods