diff --git a/README.zfs-auto-snapshot.txt b/README.zfs-auto-snapshot.txt
index 83aac6d..805e9d9 100644
--- a/README.zfs-auto-snapshot.txt
+++ b/README.zfs-auto-snapshot.txt
@@ -109,7 +109,7 @@ The properties each instance needs are:
  zfs/verbose		Set to false by default, setting to true makes the
 			service produce more output about what it's doing.
 
- zfs/avoidscrub		Set to true by default, this determines whether
+ zfs/avoidscrub		Set to false by default, this determines whether
 			we should avoid taking snapshots on any pools that have
 			a scrub or resilver in progress.
 			More info in the bugid:
diff --git a/src/var/svc/manifest/system/filesystem/auto-snapshot-daily.xml b/src/var/svc/manifest/system/filesystem/auto-snapshot-daily.xml
index 81ed4dd..fd3eaca 100644
--- a/src/var/svc/manifest/system/filesystem/auto-snapshot-daily.xml
+++ b/src/var/svc/manifest/system/filesystem/auto-snapshot-daily.xml
@@ -23,7 +23,7 @@ snapshots into the past.
 		exec='/lib/svc/method/zfs-auto-snapshot start'
 		timeout_seconds='0'>
                         <method_context>
-                                <method_credential user='zfssnap' group='staff' />
+                                <method_credential user='zfssnap' group='daemon' />
                         </method_context>
 	</exec_method>
 
@@ -33,7 +33,7 @@ snapshots into the past.
 		exec='/lib/svc/method/zfs-auto-snapshot stop'
 		timeout_seconds='0' >
 	                <method_context>
-                                <method_credential user='zfssnap' group='staff' />
+                                <method_credential user='zfssnap' group='daemon' />
                         </method_context>
 	</exec_method>
 
diff --git a/src/var/svc/manifest/system/filesystem/auto-snapshot-frequent.xml b/src/var/svc/manifest/system/filesystem/auto-snapshot-frequent.xml
index ee3179b..4139e53 100644
--- a/src/var/svc/manifest/system/filesystem/auto-snapshot-frequent.xml
+++ b/src/var/svc/manifest/system/filesystem/auto-snapshot-frequent.xml
@@ -23,7 +23,7 @@ com.sun:auto-snapshot:frequent=true every
                 exec='/lib/svc/method/zfs-auto-snapshot start'
                 timeout_seconds='0'>
                         <method_context>
-                                <method_credential user='zfssnap' group='staff' />
+                                <method_credential user='zfssnap' group='daemon' />
                         </method_context>
         </exec_method>
 
@@ -33,7 +33,7 @@ com.sun:auto-snapshot:frequent=true every
                 exec='/lib/svc/method/zfs-auto-snapshot stop'
                 timeout_seconds='0' >
                         <method_context>
-                                <method_credential user='zfssnap' group='staff' />
+                                <method_credential user='zfssnap' group='daemon' />
                         </method_context>
         </exec_method>
 
diff --git a/src/var/svc/manifest/system/filesystem/auto-snapshot-hourly.xml b/src/var/svc/manifest/system/filesystem/auto-snapshot-hourly.xml
index fccef2a..d0ffbd8 100644
--- a/src/var/svc/manifest/system/filesystem/auto-snapshot-hourly.xml
+++ b/src/var/svc/manifest/system/filesystem/auto-snapshot-hourly.xml
@@ -23,7 +23,7 @@ and keeps 24 of these snapshots into the past.
                 exec='/lib/svc/method/zfs-auto-snapshot start'
                 timeout_seconds='0'>
                         <method_context>
-                                <method_credential user='zfssnap' group='staff' />
+                                <method_credential user='zfssnap' group='daemon' />
                         </method_context>
         </exec_method>
 
@@ -33,7 +33,7 @@ and keeps 24 of these snapshots into the past.
                 exec='/lib/svc/method/zfs-auto-snapshot stop'
                 timeout_seconds='0' >
                         <method_context>
-                                <method_credential user='zfssnap' group='staff' />
+                                <method_credential user='zfssnap' group='daemon' />
                         </method_context>
         </exec_method>
 
diff --git a/src/var/svc/manifest/system/filesystem/auto-snapshot-monthly.xml b/src/var/svc/manifest/system/filesystem/auto-snapshot-monthly.xml
index 1b7bcfe..fb0f6c1 100644
--- a/src/var/svc/manifest/system/filesystem/auto-snapshot-monthly.xml
+++ b/src/var/svc/manifest/system/filesystem/auto-snapshot-monthly.xml
@@ -23,7 +23,7 @@ and keeps 12 of these snapshots into the past.
                 exec='/lib/svc/method/zfs-auto-snapshot start'
                 timeout_seconds='0'>
                         <method_context>
-                                <method_credential user='zfssnap' group='staff' />
+                                <method_credential user='zfssnap' group='daemon' />
                         </method_context>
         </exec_method>
 
@@ -33,7 +33,7 @@ and keeps 12 of these snapshots into the past.
                 exec='/lib/svc/method/zfs-auto-snapshot stop'
                 timeout_seconds='0' >
                         <method_context>
-                                <method_credential user='zfssnap' group='staff' />
+                                <method_credential user='zfssnap' group='daemon' />
                         </method_context>
         </exec_method>
 
diff --git a/src/var/svc/manifest/system/filesystem/auto-snapshot-weekly.xml b/src/var/svc/manifest/system/filesystem/auto-snapshot-weekly.xml
index bea8d0e..c6cddb0 100644
--- a/src/var/svc/manifest/system/filesystem/auto-snapshot-weekly.xml
+++ b/src/var/svc/manifest/system/filesystem/auto-snapshot-weekly.xml
@@ -23,7 +23,7 @@ and keeps 4 of these snapshots into the past.
                 exec='/lib/svc/method/zfs-auto-snapshot start'
                 timeout_seconds='0'>
                         <method_context>
-                                <method_credential user='zfssnap' group='staff' />
+                                <method_credential user='zfssnap' group='daemon' />
                         </method_context>
         </exec_method>
 
@@ -33,7 +33,7 @@ and keeps 4 of these snapshots into the past.
                 exec='/lib/svc/method/zfs-auto-snapshot stop'
                 timeout_seconds='0' >
                         <method_context>
-                                <method_credential user='zfssnap' group='staff' />
+                                <method_credential user='zfssnap' group='daemon' />
                         </method_context>
         </exec_method>
 
diff --git a/src/var/svc/manifest/system/filesystem/zfs-auto-snapshot.xml b/src/var/svc/manifest/system/filesystem/zfs-auto-snapshot.xml
index 00de11d..48194d0 100755
--- a/src/var/svc/manifest/system/filesystem/zfs-auto-snapshot.xml
+++ b/src/var/svc/manifest/system/filesystem/zfs-auto-snapshot.xml
@@ -27,7 +27,7 @@
 
 -->
 
-<service_bundle type='manifest' name='TIMFzfssnap:filesystem-zfs-auto-snapshot'>
+<service_bundle type='manifest' name='SUNWzfs-auto-snapshot:filesystem-zfs-auto-snapshot'>
 
 <service
 	name='system/filesystem/zfs/auto-snapshot'
@@ -180,7 +180,7 @@ they being :
                 exec='/lib/svc/method/zfs-auto-snapshot start'
                 timeout_seconds='0'>
                         <method_context>
-                                <method_credential user='zfssnap' group='staff' />
+                                <method_credential user='zfssnap' group='daemon' />
                         </method_context>
         </exec_method>
 
@@ -190,7 +190,7 @@ they being :
                 exec='/lib/svc/method/zfs-auto-snapshot stop'
                 timeout_seconds='0' >
                         <method_context>
-                                <method_credential user='zfssnap' group='staff' />
+                                <method_credential user='zfssnap' group='daemon' />
                         </method_context>
         </exec_method>
 
@@ -250,7 +250,7 @@ On stopping the service, that cron job is removed.
 
 We also have the ability to perform backups, done using the "zfs send" command.  A property set in the service called "backup-save-cmd" can be configured as the command used to save the backup stream. See the zfs(1M) man page for an example.  The backups can be either "full" backups, or "incremental" backups - for each incremental backup, a full backup must be configured first. If for some reason an incremental backup fails, a full backup is performed instead.
 
-By default, snapshots will not be taken of any datasets resident on pools that are currently being scrubbed or resilvered. This can behaviour can be changed using the zfs/avoid scrub service property.
+By default, snapshots will be taken of any datasets resident on pools that are currently being scrubbed or resilvered. This can behaviour can be changed using the zfs/avoid scrub service property.
 
 Care should be taken when configuring backups to ensure that the time granularity of the cron job is sufficient to allow the backup to complete between invocations of each backup. We perform locking to ensure that two backups of the same filesystem cannot run simultaneously, but will move the service into "maintenance" state should this occur.
 			</loctext>