Index: /trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp	(revision 48310)
+++ /trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp	(revision 48311)
@@ -1542,4 +1542,5 @@
     RTSpinlockReleaseNoInts(pDevExt->EventSpinlock);
     Assert(rc == 0);
+    NOREF(rc);
 
 #ifdef VBOXGUEST_USE_DEFERRED_WAKE_UP
@@ -3073,4 +3074,5 @@
     ASMAtomicDecU32(&pDevExt->cISR);
     Assert(rc == 0);
+    NOREF(rc);
     return fOurIrq;
 }
Index: /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp	(revision 48310)
+++ /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp	(revision 48311)
@@ -454,5 +454,5 @@
         uint64_t u64Total = 0, u64Free = 0, u64Buffers = 0, u64Cached = 0, u64PagedTotal = 0;
         int rc = -1;
-        kstat_t *pStatPages = kstat_lookup(pStatKern, "unix", 0 /* instance */, "system_pages");
+        kstat_t *pStatPages = kstat_lookup(pStatKern, (char *)"unix", 0 /* instance */, (char *)"system_pages");
         if (pStatPages)
         {
@@ -461,9 +461,9 @@
             {
                 kstat_named_t *pStat = NULL;
-                pStat = (kstat_named_t *)kstat_data_lookup(pStatPages, "pagestotal");
+                pStat = (kstat_named_t *)kstat_data_lookup(pStatPages, (char *)"pagestotal");
                 if (pStat)
                     u64Total = pStat->value.ul;
 
-                pStat = (kstat_named_t *)kstat_data_lookup(pStatPages, "freemem");
+                pStat = (kstat_named_t *)kstat_data_lookup(pStatPages, (char *)"freemem");
                 if (pStat)
                     u64Free = pStat->value.ul;
@@ -471,5 +471,5 @@
         }
 
-        kstat_t *pStatZFS = kstat_lookup(pStatKern, "zfs", 0 /* instance */, "arcstats");
+        kstat_t *pStatZFS = kstat_lookup(pStatKern, (char *)"zfs", 0 /* instance */, (char *)"arcstats");
         if (pStatZFS)
         {
@@ -477,5 +477,5 @@
             if (rc != -1)
             {
-                kstat_named_t *pStat = (kstat_named_t *)kstat_data_lookup(pStatZFS, "size");
+                kstat_named_t *pStat = (kstat_named_t *)kstat_data_lookup(pStatZFS, (char *)"size");
                 if (pStat)
                     u64Cached = pStat->value.ul;
@@ -487,5 +487,5 @@
          * number of stat updates so far and use that to divide the swap counter.
          */
-        kstat_t *pStatInfo = kstat_lookup(pStatKern, "unix", 0 /* instance */, "sysinfo");
+        kstat_t *pStatInfo = kstat_lookup(pStatKern, (char *)"unix", 0 /* instance */, (char *)"sysinfo");
         if (pStatInfo)
         {
@@ -494,5 +494,5 @@
             if (rc != -1)
             {
-                kstat_t *pStatVMInfo = kstat_lookup(pStatKern, "unix", 0 /* instance */, "vminfo");
+                kstat_t *pStatVMInfo = kstat_lookup(pStatKern, (char *)"unix", 0 /* instance */, (char *)"vminfo");
                 if (pStatVMInfo)
                 {
@@ -717,2 +717,3 @@
     VBoxServiceVMStatsTerm
 };
+
Index: /trunk/src/VBox/Main/src-server/SnapshotImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/SnapshotImpl.cpp	(revision 48310)
+++ /trunk/src/VBox/Main/src-server/SnapshotImpl.cpp	(revision 48311)
@@ -1435,5 +1435,5 @@
  * When the console is done, it calls SessionMachine::EndTakingSnapshot().
  *
- *  @note Locks mParent + this object for writing.
+ * @note Locks mParent + this object for writing.
  *
  * @param aInitiator in: The console on which Console::TakeSnapshot was called.
@@ -3399,4 +3399,7 @@
     AssertReturn(aSource != aTarget, E_FAIL);
     AssertReturn(aMediumLockList != NULL, E_FAIL);
+    NOREF(fMergeForward);
+    NOREF(aParentForTarget);
+    NOREF(aChildrenToReparent);
 
     HRESULT rc = S_OK;
@@ -3644,2 +3647,3 @@
     return S_OK;
 }
+