--- a/usr/src/cmd/system-config/__init__.py	Wed May 09 08:51:52 2012 +0200
+++ b/usr/src/cmd/system-config/__init__.py	Wed May 09 07:53:34 2012 -0600
@@ -880,8 +880,8 @@
             sys.exit(SU_FATAL_ERR)
 
         print _("Interactive configuration requested.")
-        print _("System Configuration Interactive (SCI) tool will be" +
-            " launched on console.")
+        print _("System Configuration Interactive (SCI) tool will be "
+                "launched on console.")
 
         cmd = [TTY]
         try:

--- a/usr/src/cmd/system-config/nameservice.py	Wed May 09 08:51:52 2012 +0200
+++ b/usr/src/cmd/system-config/nameservice.py	Wed May 09 07:53:34 2012 -0600
@@ -477,7 +477,7 @@
                                         text=self.nameservice.ldap_search_base,
                                         error_win=self.main_win.error_line)
         self.main_win.do_update()
-        self.center_win.activate_object(self.ldap_ip)
+        self.center_win.activate_object(self.ldap_profile)
 
     def validate(self):
         validate_ldap_profile(self.ldap_profile.get_text())

--- a/usr/src/cmd/system-config/profile/system_info.py	Wed May 09 08:51:52 2012 +0200
+++ b/usr/src/cmd/system-config/profile/system_info.py	Wed May 09 07:53:34 2012 -0600
@@ -327,7 +327,9 @@
         smf_pg_config = SMFPropertyGroup('config')
         smf_instance_system_identity.insert_children([smf_pg_config])
 
-        smf_pg_config.add_props(nodename=self.hostname)
+        # force the property type to 'astring'
+        smf_pg_config.setprop(name="nodename", ptype="astring",
+                              value=self.hostname)
 
         #
         # fmri: