Index: /trunk/src/VBox/Main/include/GuestProcessImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/GuestProcessImpl.h	(revision 42215)
+++ /trunk/src/VBox/Main/include/GuestProcessImpl.h	(revision 42216)
@@ -115,6 +115,4 @@
         RTSEMEVENT               mEvent;
     } mData;
-
-    friend GuestSession; /* Let's be friends! */
 };
 
Index: /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp	(revision 42215)
+++ /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp	(revision 42216)
@@ -353,6 +353,6 @@
     if (it != mData.mCallbacks.end())
     {
-        std::auto_ptr<GuestCtrlCallback> pCallback = it->second;
-        AssertPtr(pCallback.get());
+        GuestCtrlCallback *pCallback = it->second;
+        AssertPtr(pCallback);
 
         int rc;
@@ -745,5 +745,5 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    com::SafeArray<BYTE> data(aData);
+    com::SafeArray<BYTE> data(ComSafeArrayInArg(aData));
     int rc = writeData(aHandle, data.raw(), data.size(), aTimeoutMS, aWritten);
     /** @todo Do setError() here. */