diff --git a/src/preferences/shortcuts/ShortcutsSpec.cpp b/src/preferences/shortcuts/ShortcutsSpec.cpp
index 2fbb513b2e..d7f5ca51bc 100644
--- a/src/preferences/shortcuts/ShortcutsSpec.cpp
+++ b/src/preferences/shortcuts/ShortcutsSpec.cpp
@@ -488,7 +488,7 @@ ShortcutsSpec::GetCellText(int whichColumn) const
 				if (temp == NULL)
 					temp = "";
 			} else if (fKey > 0xFF) {
-				sprintf(fScratch, "#%lx", fKey);
+				sprintf(fScratch, "#%" B_PRIx32, fKey);
 				return fScratch;
 			}
 			break;
diff --git a/src/preferences/shortcuts/ShortcutsWindow.cpp b/src/preferences/shortcuts/ShortcutsWindow.cpp
index 5a5c6785e6..dd2803937c 100644
--- a/src/preferences/shortcuts/ShortcutsWindow.cpp
+++ b/src/preferences/shortcuts/ShortcutsWindow.cpp
@@ -569,7 +569,8 @@ ShortcutsWindow::MessageReceived(BMessage* msg)
 				if (fLastOpenWasAppend == false) {
 					// Clear the menu...
 					while (ShortcutsSpec* item
-						= ((ShortcutsSpec*)fColumnListView->RemoveItem(0L))) {
+						= ((ShortcutsSpec*)
+							fColumnListView->RemoveItem((int32)0))) {
 						delete item;
 					}
 				}
diff --git a/src/preferences/shortcuts/clv/ColumnListView.cpp b/src/preferences/shortcuts/clv/ColumnListView.cpp
index b9c78192fc..bc7f496ab9 100644
--- a/src/preferences/shortcuts/clv/ColumnListView.cpp
+++ b/src/preferences/shortcuts/clv/ColumnListView.cpp
@@ -1255,7 +1255,7 @@ bool ColumnListView::RemoveItems(int32 fullListIndex, int32 count)
 	CLVListItem* TheItem;
 	if(fHierarchical)
 	{
-		uint32 LastSuperItemLevel = ULONG_MAX;
+		uint32 LastSuperItemLevel = UINT32_MAX;
 		int32 Counter;
 		int32 DisplayItemsToRemove = 0;
 		int32 FirstDisplayItemToRemove = -1;