Minor mods

Minor mods