diff --git a/src/preferences/joysticks/Jamfile b/src/preferences/joysticks/Jamfile
index b3681093a4..172aa4e7a3 100644
--- a/src/preferences/joysticks/Jamfile
+++ b/src/preferences/joysticks/Jamfile
@@ -8,7 +8,7 @@ Preference Joysticks :
 	Joysticks.cpp
 	MessageWin.cpp
 	PortItem.cpp
-	: be libdevice.so
+	: be libdevice.so $(TARGET_LIBSUPC++)
 	: Joysticks.rdef
 	;
 
diff --git a/src/preferences/joysticks/JoyWin.cpp b/src/preferences/joysticks/JoyWin.cpp
index f9a939eeb8..fb03fea1c3 100644
--- a/src/preferences/joysticks/JoyWin.cpp
+++ b/src/preferences/joysticks/JoyWin.cpp
@@ -191,7 +191,7 @@ JoyWin::MessageReceived(BMessage *message)
 				}
 			} else {
 				fConControllerL->DeselectAll();
-				ShowMessage(SELECTGAMEPORTFIRST);
+				ShowMessage((char*)SELECTGAMEPORTFIRST);
 			}
 		break;
 		}
@@ -204,7 +204,7 @@ JoyWin::MessageReceived(BMessage *message)
 				//printf("invoke.. inte null\n");
 				_PerformProbe(item->Text());
 			} else
-				ShowMessage(SELECTGAMEPORTFIRST);
+				ShowMessage((char*)SELECTGAMEPORTFIRST);
 		break;
 		}
 
@@ -233,7 +233,7 @@ JoyWin::MessageReceived(BMessage *message)
 					dir->CreateSymLink(strLinkPlace.String(),
 						strLinkTo.String(), NULL);
 				} else
-					ShowMessage(SELECTGAMEPORTFIRST);
+					ShowMessage((char*)SELECTGAMEPORTFIRST);
 			}
 
 			fSystemUsedSelect = false;
@@ -256,7 +256,7 @@ JoyWin::MessageReceived(BMessage *message)
 					*/
 				}
 			} else
-				ShowMessage(SELECTGAMEPORTFIRST);
+				ShowMessage((char*)SELECTGAMEPORTFIRST);
 		break;
 		}
 		default:
@@ -276,8 +276,8 @@ JoyWin::QuitRequested()
 
 //---------------------- Private ---------------------------------//
 status_t
-JoyWin::_AddToList(BListView *list, uint32 command,
-	const char* rootPath, BEntry *rootEntry = NULL)
+JoyWin::_AddToList(BListView *list, uint32 command, const char* rootPath,
+	BEntry *rootEntry)
 {
 	BDirectory root;
 
diff --git a/src/preferences/joysticks/PortItem.cpp b/src/preferences/joysticks/PortItem.cpp
index d2c7c4731c..fd297331b1 100644
--- a/src/preferences/joysticks/PortItem.cpp
+++ b/src/preferences/joysticks/PortItem.cpp
@@ -3,7 +3,7 @@
  * Distributed under the terms of the MIT License.
  *
  * Authors:
- *		Fredrik Modéen 			fredrik@modeen.se 
+ *		Fredrik Modéen 			fredrik@modeen.se
  */
 
 #include "PortItem.h"
@@ -17,7 +17,7 @@ PortItem::~PortItem()
 {}
 
 void
-PortItem::DrawItem(BView *owner, BRect frame, bool complete = false)
+PortItem::DrawItem(BView *owner, BRect frame, bool complete)
 {
 	BStringItem::DrawItem(owner, frame, complete);
 }
@@ -32,7 +32,7 @@ PortItem::GetOldJoystickName()
 BString
 PortItem::GetJoystickName()
 {
-	return fSelectedJoystick;	
+	return fSelectedJoystick;
 }
 
 
@@ -40,5 +40,5 @@ void
 PortItem::SetJoystickName(BString str)
 {
 	fOldSelectedJoystick = fSelectedJoystick;
-	fSelectedJoystick = str;	
+	fSelectedJoystick = str;
 }