diff --git a/src/preferences/bluetooth/BluetoothSettingsView.cpp b/src/preferences/bluetooth/BluetoothSettingsView.cpp
index 0e9a6a06c9..a158f45b37 100644
--- a/src/preferences/bluetooth/BluetoothSettingsView.cpp
+++ b/src/preferences/bluetooth/BluetoothSettingsView.cpp
@@ -304,7 +304,7 @@ BluetoothSettingsView::_BuildLocalDevicesMenu()
 		fLocalDevicesMenu = new BPopUpMenu(B_TRANSLATE("Pick device..."));
 
 	while (fLocalDevicesMenu->CountItems() > 0) {
-		BMenuItem* item = fLocalDevicesMenu->RemoveItem(0L);
+		BMenuItem* item = fLocalDevicesMenu->RemoveItem(0);
 
 		if (item != NULL) {
 			delete item;
diff --git a/src/preferences/bluetooth/RemoteDevicesView.cpp b/src/preferences/bluetooth/RemoteDevicesView.cpp
index 0a1e6a39e2..88da8707a3 100644
--- a/src/preferences/bluetooth/RemoteDevicesView.cpp
+++ b/src/preferences/bluetooth/RemoteDevicesView.cpp
@@ -121,14 +121,15 @@ RemoteDevicesView::MessageReceived(BMessage* message)
 	switch (message->what) {
 		case kMsgAddDevices:
 		{
-			InquiryPanel* inquiryPanel = new InquiryPanel(BRect(100, 100, 450, 450),
-				ActiveLocalDevice);
+			InquiryPanel* inquiryPanel= new InquiryPanel(
+				BRect(100, 100, 450, 450), ActiveLocalDevice);
 			inquiryPanel->Show();
 			break;
 		}
 
 		case kMsgRemoveDevice:
-			printf("kMsgRemoveDevice: %ld\n", fDeviceList->CurrentSelection(0));
+			printf("kMsgRemoveDevice: %" B_PRId32 "\n",
+				fDeviceList->CurrentSelection(0));
 			fDeviceList->RemoveItem(fDeviceList->CurrentSelection(0));
 			break;
 		case kMsgAddToRemoteList: