diff --git a/Tools/px_generate_params.py b/Tools/px_generate_params.py
index a68e967ed9..bcbcc4b876 100755
--- a/Tools/px_generate_params.py
+++ b/Tools/px_generate_params.py
@@ -42,9 +42,6 @@ __BEGIN_DECLS
 
 struct px4_parameters_t {
 """
-start_name = ""
-end_name = ""
-
 params = []
 for group in root:
 	if group.tag == "group" and "no_code_generation" not in group.attrib:
@@ -52,9 +49,6 @@ for group in root:
 			scope_ = param.find('scope').text
 			if not cmake_scope.Has(scope_):
 				continue
-			if not start_name:
-				start_name = param.attrib["name"]
-			end_name = param.attrib["name"]
 			params.append(param)
 
 params = sorted(params, key=lambda name: name.attrib["name"])
diff --git a/cmake/common/px4_base.cmake b/cmake/common/px4_base.cmake
index b0243f99ba..4ba1679f52 100644
--- a/cmake/common/px4_base.cmake
+++ b/cmake/common/px4_base.cmake
@@ -1024,7 +1024,8 @@ function(px4_generate_parameters_xml)
 	add_custom_command(OUTPUT ${OUT}
 		COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/px_process_params.py
 			-s ${path} --board CONFIG_ARCH_${BOARD} --xml --inject-xml --scope ${SCOPE}
-		DEPENDS ${param_src_files}
+		DEPENDS ${param_src_files} ${PX4_SOURCE_DIR}/Tools/px_process_params.py
+			${PX4_SOURCE_DIR}/Tools/px_generate_params.py
 		)
 	set(${OUT} ${${OUT}} PARENT_SCOPE)
 endfunction()
diff --git a/src/modules/systemlib/param/param.c b/src/modules/systemlib/param/param.c
index 751c3d3213..35ebb5f63a 100644
--- a/src/modules/systemlib/param/param.c
+++ b/src/modules/systemlib/param/param.c
@@ -263,7 +263,7 @@ param_find_internal(const char *name, bool notification)
 {
 	param_t middle;
 	param_t front = 0;
-	param_t last = get_param_info_count() - 1;
+	param_t last = get_param_info_count();
 
 	/* perform a binary search of the known parameters */
 
@@ -278,7 +278,7 @@ param_find_internal(const char *name, bool notification)
 
 			return middle;
 
-		} else if (middle == front || middle == last) {
+		} else if (middle == front) {
 			/* An end point has been hit, but there has been no match */
 			break;
 
diff --git a/src/systemcmds/param/param.c b/src/systemcmds/param/param.c
index 3442ab563a..e270ed9605 100644
--- a/src/systemcmds/param/param.c
+++ b/src/systemcmds/param/param.c
@@ -351,7 +351,7 @@ do_find(const char *name)
 		return 1;
 	}
 
-	printf("Found param %s at index %lu\n", name, ret);
+	printf("Found param %s at index %"PRIxPTR"\n", name, ret);
 	return 0;
 }