diff --git a/src/add-ons/kernel/bus_managers/config_manager/Jamfile b/src/add-ons/kernel/bus_managers/config_manager/Jamfile
index b0333cae66..e88370ef0b 100644
--- a/src/add-ons/kernel/bus_managers/config_manager/Jamfile
+++ b/src/add-ons/kernel/bus_managers/config_manager/Jamfile
@@ -7,4 +7,5 @@ KernelAddon config_manager :
 	: config_manager_arch.a
 	;
 
-SubInclude HAIKU_TOP src add-ons kernel bus_managers config_manager arch $(TARGET_ARCH) ;
+SubInclude HAIKU_TOP src add-ons kernel bus_managers config_manager arch
+	$(TARGET_KERNEL_ARCH) ;
diff --git a/src/add-ons/kernel/bus_managers/config_manager/config_manager.c b/src/add-ons/kernel/bus_managers/config_manager/config_manager.c
index 4f6ede94aa..ccb7a66261 100644
--- a/src/add-ons/kernel/bus_managers/config_manager/config_manager.c
+++ b/src/add-ons/kernel/bus_managers/config_manager/config_manager.c
@@ -29,7 +29,7 @@ static pci_module_info *gPCI = NULL;
 static status_t
 driver_get_next_device_info(bus_type bus, uint64 *cookie, struct device_info *info, uint32 size)
 {
-	FUNCTION("(bus = %d, cookie = %lld)\n", bus, *cookie);
+	FUNCTION("(bus = %d, cookie = %" B_PRId64 ")\n", bus, *cookie);
 	return B_ENTRY_NOT_FOUND;
 }
 
@@ -37,7 +37,7 @@ driver_get_next_device_info(bus_type bus, uint64 *cookie, struct device_info *in
 static status_t
 driver_get_device_info_for(uint64 id, struct device_info *info, uint32 size)
 {
-	FUNCTION("(id = %Ld)\n", id);
+	FUNCTION("(id = %" B_PRId64 ")\n", id);
 	return B_ENTRY_NOT_FOUND;
 }
 
@@ -45,7 +45,7 @@ driver_get_device_info_for(uint64 id, struct device_info *info, uint32 size)
 static status_t
 driver_get_size_of_current_configuration_for(uint64 id)
 {
-	FUNCTION("(id = %Ld)\n", id);
+	FUNCTION("(id = %" B_PRId64 ")\n", id);
 	return B_ENTRY_NOT_FOUND;
 }
 
@@ -53,7 +53,8 @@ driver_get_size_of_current_configuration_for(uint64 id)
 static status_t
 driver_get_current_configuration_for(uint64 id, struct device_configuration *current, uint32 size)
 {
-	FUNCTION("(id = %Ld, current = %p, size = %lu)\n", id, current, size);
+	FUNCTION("(id = %" B_PRId64 ", current = %p, size = %" B_PRIu32 ")\n", id,
+		current, size);
 	return B_ENTRY_NOT_FOUND;
 }
 
@@ -61,7 +62,7 @@ driver_get_current_configuration_for(uint64 id, struct device_configuration *cur
 static status_t
 driver_get_size_of_possible_configurations_for(uint64 id)
 {
-	FUNCTION("(id = %Ld)\n", id);
+	FUNCTION("(id = %" B_PRId64 ")\n", id);
 	return B_ENTRY_NOT_FOUND;
 }
 
@@ -69,7 +70,8 @@ driver_get_size_of_possible_configurations_for(uint64 id)
 static status_t
 driver_get_possible_configurations_for(uint64 id, struct possible_device_configurations *possible, uint32 size)
 {
-	FUNCTION("(id = %Ld, possible = %p, size = %lu)\n", id, possible, size);
+	FUNCTION("(id = %" B_PRId64 ", possible = %p, size = %" B_PRIu32 ")\n", id,
+		possible, size);
 	return B_ENTRY_NOT_FOUND;
 }
 
@@ -86,7 +88,7 @@ static status_t
 driver_get_nth_resource_descriptor_of_type(const struct device_configuration *config, uint32 num,
 	resource_type type, resource_descriptor *descr, uint32 size)
 {
-	FUNCTION("(config = %p, num = %ld)\n", config, num);
+	FUNCTION("(config = %p, num = %" B_PRId32 ")\n", config, num);
 	return B_ENTRY_NOT_FOUND;
 }