diff --git a/src/kits/media/experimental/MediaClient.cpp b/src/kits/media/experimental/MediaClient.cpp
index 3b15b730d3..70fe70702e 100755
--- a/src/kits/media/experimental/MediaClient.cpp
+++ b/src/kits/media/experimental/MediaClient.cpp
@@ -179,8 +179,7 @@ BMediaClient::Unbind(BMediaInput* input, BMediaOutput* output)
 {
 	CALLED();
 
-	if (input == NULL
-		|| input == NULL)
+	if (input == NULL || output == NULL)
 		return B_ERROR;
 
 	if (input->fOwner != this || output->fOwner != this)
diff --git a/src/servers/app/BitmapManager.cpp b/src/servers/app/BitmapManager.cpp
index dceaf6bed2..347289748b 100644
--- a/src/servers/app/BitmapManager.cpp
+++ b/src/servers/app/BitmapManager.cpp
@@ -48,7 +48,7 @@ BitmapManager *gBitmapManager = NULL;
 int
 compare_app_pointer(const ServerApp* a, const ServerApp* b)
 {
-	return (addr_t)b - (addr_t)b;
+	return (addr_t)a - (addr_t)b;
 }