diff --git a/src/kits/media/MediaRoster.cpp b/src/kits/media/MediaRoster.cpp
index b43e3ae9db..bca6b76568 100644
--- a/src/kits/media/MediaRoster.cpp
+++ b/src/kits/media/MediaRoster.cpp
@@ -98,7 +98,10 @@ BMediaRosterEx::BMediaRosterEx(status_t * out_error)
 	request.team = team;
 	request.messenger = BMessenger(NULL, this);
 	rv = QueryServer(SERVER_REGISTER_APP, &request, sizeof(request), &reply, sizeof(reply));
-	*out_error = (rv != B_OK) ? B_MEDIA_SYSTEM_FAILURE : B_OK;
+	if (rv != B_OK)
+		*out_error = B_MEDIA_SYSTEM_FAILURE;
+	else
+		*out_error = B_OK;
 }
 
 status_t
diff --git a/src/kits/media/OldBufferStream.cpp b/src/kits/media/OldBufferStream.cpp
index aaca970ecb..c4faf4ac86 100644
--- a/src/kits/media/OldBufferStream.cpp
+++ b/src/kits/media/OldBufferStream.cpp
@@ -9,6 +9,12 @@
 /*************************************************************
  * public BAbstractBufferStream
  *************************************************************/
+#if __GNUC__ > 3
+BAbstractBufferStream::~BAbstractBufferStream()
+{
+}
+#endif
+
 
 status_t
 BAbstractBufferStream::GetStreamParameters(size_t *bufferSize,
diff --git a/src/kits/media/OldBufferStream.h b/src/kits/media/OldBufferStream.h
index 61ffd9dfd4..9212b85409 100644
--- a/src/kits/media/OldBufferStream.h
+++ b/src/kits/media/OldBufferStream.h
@@ -74,6 +74,9 @@ typedef BBufferStream* stream_id;  // for now
 class BAbstractBufferStream
 {
 public:
+#if __GNUC__ > 3
+	virtual				~BAbstractBufferStream();
+#endif
 
 	virtual	status_t	GetStreamParameters(size_t *bufferSize,
 											int32 *bufferCount,