diff --git a/librz/bin/p/bin_elf.inc b/librz/bin/p/bin_elf.inc
index 02130a28742..9d7212dad1c 100644
--- a/librz/bin/p/bin_elf.inc
+++ b/librz/bin/p/bin_elf.inc
@@ -193,7 +193,7 @@ static int check_buffer_aux(RzBuffer *buf) {
 #endif
 
 static bool load_buffer(RZ_UNUSED RzBinFile *bf, RzBinObject *obj, RzBuffer *buf, RZ_UNUSED Sdb *sdb) {
-	rz_return_val_if_fail(obj, NULL);
+	rz_return_val_if_fail(obj, false);
 
 	ELFOBJ *bin = Elf_(rz_bin_elf_new_buf)(buf, &obj->opts);
 	if (!bin) {
diff --git a/librz/config/config.c b/librz/config/config.c
index 2b866a0875e..af11ede0a05 100644
--- a/librz/config/config.c
+++ b/librz/config/config.c
@@ -95,7 +95,7 @@ RZ_API RZ_BORROW const char *rz_config_get(RzConfig *cfg, RZ_NONNULL const char
  * Returns true in case of success.
  */
 RZ_API bool rz_config_toggle(RzConfig *cfg, RZ_NONNULL const char *name) {
-	rz_return_val_if_fail(cfg && RZ_STR_ISNOTEMPTY(name), NULL);
+	rz_return_val_if_fail(cfg && RZ_STR_ISNOTEMPTY(name), false);
 	RzConfigNode *node = rz_config_node_get(cfg, name);
 	if (!node) {
 		return false;
@@ -390,7 +390,7 @@ RZ_API const char *rz_config_node_desc(RzConfigNode *node, RZ_NULLABLE const cha
 }
 
 RZ_API bool rz_config_rm(RzConfig *cfg, RZ_NONNULL const char *name) {
-	rz_return_val_if_fail(RZ_STR_ISNOTEMPTY(name) && cfg, NULL);
+	rz_return_val_if_fail(RZ_STR_ISNOTEMPTY(name) && cfg, false);
 	RzConfigNode *node = rz_config_node_get(cfg, name);
 	if (node) {
 		ht_pp_delete(cfg->ht, node->name);
diff --git a/librz/core/agraph.c b/librz/core/agraph.c
index 8ff0e65654e..6b3cea1811c 100644
--- a/librz/core/agraph.c
+++ b/librz/core/agraph.c
@@ -4903,7 +4903,7 @@ RZ_IPI int rz_core_visual_graph(RzCore *core, RzAGraph *g, RzAnalysisFunction *_
  * \return Success
  */
 RZ_API bool create_agraph_from_graph_at(RZ_NONNULL RzAGraph *ag, RZ_NONNULL const RzGraph /*<RzGraphNodeInfo *>*/ *g, bool free_on_fail) {
-	rz_return_val_if_fail(ag && g, NULL);
+	rz_return_val_if_fail(ag && g, false);
 	ag->need_reload_nodes = false;
 	// Cache lookup to build edges
 	HtPPOptions pointer_options = { 0 };
diff --git a/librz/core/cgraph.c b/librz/core/cgraph.c
index b24a350650e..fe7cdfba050 100644
--- a/librz/core/cgraph.c
+++ b/librz/core/cgraph.c
@@ -705,7 +705,7 @@ RZ_API RZ_OWN char *rz_core_graph_to_sdb_str(RZ_NONNULL RzCore *core, RZ_NONNULL
  * \brief Convert \p graph to an image, and write it to \p filename.
  */
 RZ_API bool rz_core_graph_write_graph(RZ_NONNULL RzCore *core, RZ_NONNULL RzGraph /*<RzGraphNodeInfo *>*/ *graph, RZ_NONNULL const char *filename) {
-	rz_return_val_if_fail(core && graph && filename, NULL);
+	rz_return_val_if_fail(core && graph && filename, false);
 	char *dot_text = rz_core_graph_to_dot_str(core, graph);
 	if (!dot_text) {
 		return false;
diff --git a/librz/il/definitions/variable.c b/librz/il/definitions/variable.c
index a65f6dccbf9..56b9a886576 100644
--- a/librz/il/definitions/variable.c
+++ b/librz/il/definitions/variable.c
@@ -127,7 +127,7 @@ RZ_API RZ_OWN RZ_NULLABLE RzILVal *rz_il_var_set_remove_var(RzILVarSet *vs, cons
  * \return whether the value was successfully bound
  */
 RZ_API bool rz_il_var_set_bind(RzILVarSet *vs, const char *name, RZ_OWN RzILVal *val) {
-	rz_return_val_if_fail(vs && name && val, NULL);
+	rz_return_val_if_fail(vs && name && val, false);
 	RzILVar *var = ht_pp_find(vs->vars, name, NULL);
 	if (!var || !rz_il_sort_pure_eq(var->sort, rz_il_value_get_sort(val))) {
 		if (!var) {
diff --git a/librz/il/il_vm_eval.c b/librz/il/il_vm_eval.c
index 827de2a6f0d..0e8ee20804d 100644
--- a/librz/il/il_vm_eval.c
+++ b/librz/il/il_vm_eval.c
@@ -318,9 +318,9 @@ static void *eval_pure(RZ_NONNULL RzILVM *vm, RZ_NONNULL RzILOpPure *op, RZ_NONN
 }
 
 static bool eval_effect(RZ_NONNULL RzILVM *vm, RZ_NONNULL RzILOpEffect *op) {
-	rz_return_val_if_fail(vm && op, NULL);
+	rz_return_val_if_fail(vm && op, false);
 	RzILOpEffectHandler handler = vm->op_handler_effect_table[op->code];
-	rz_return_val_if_fail(handler, NULL);
+	rz_return_val_if_fail(handler, false);
 	return handler(vm, op);
 }
 
diff --git a/librz/il/theory_effect.c b/librz/il/theory_effect.c
index 6e386c07a9a..0ea3091a331 100644
--- a/librz/il/theory_effect.c
+++ b/librz/il/theory_effect.c
@@ -98,7 +98,7 @@ bool rz_il_handler_blk(RzILVM *vm, RzILOpEffect *op) {
 }
 
 bool rz_il_handler_repeat(RzILVM *vm, RzILOpEffect *op) {
-	rz_return_val_if_fail(vm && op, NULL);
+	rz_return_val_if_fail(vm && op, false);
 
 	RzILOpArgsRepeat *op_repeat = &op->op.repeat;
 	bool res = true;
diff --git a/librz/il/theory_init.c b/librz/il/theory_init.c
index 8ba5576ed90..3d710d2c0bd 100644
--- a/librz/il/theory_init.c
+++ b/librz/il/theory_init.c
@@ -78,7 +78,7 @@ void *rz_il_handler_pure_unimplemented(RzILVM *vm, RzILOpPure *op, RzILTypePure
 }
 
 bool rz_il_handler_effect_unimplemented(RzILVM *vm, RzILOpEffect *op) {
-	rz_return_val_if_fail(vm && op, NULL);
+	rz_return_val_if_fail(vm && op, false);
 	RZ_LOG_ERROR("RzIL: unimplemented op handler (%d).\n", (int)op->code);
 	return false;
 }
diff --git a/librz/il/theory_mem.c b/librz/il/theory_mem.c
index 12b9ce83c97..9ca23bd3779 100644
--- a/librz/il/theory_mem.c
+++ b/librz/il/theory_mem.c
@@ -20,7 +20,7 @@ void *rz_il_handler_load(RzILVM *vm, RzILOpBitVector *op, RzILTypePure *type) {
 }
 
 bool rz_il_handler_store(RzILVM *vm, RzILOpEffect *op) {
-	rz_return_val_if_fail(vm && op, NULL);
+	rz_return_val_if_fail(vm && op, false);
 
 	RzILOpArgsStore *op_store = &op->op.store;
 
@@ -53,7 +53,7 @@ void *rz_il_handler_loadw(RzILVM *vm, RzILOpBitVector *op, RzILTypePure *type) {
 }
 
 bool rz_il_handler_storew(RzILVM *vm, RzILOpEffect *op) {
-	rz_return_val_if_fail(vm && op, NULL);
+	rz_return_val_if_fail(vm && op, false);
 
 	RzILOpArgsStoreW *op_storew = &op->op.storew;
 
diff --git a/librz/sign/sigdb.c b/librz/sign/sigdb.c
index 1db43bc17f4..71c61645d8c 100644
--- a/librz/sign/sigdb.c
+++ b/librz/sign/sigdb.c
@@ -156,7 +156,7 @@ RZ_API RZ_OWN RzSigDb *rz_sign_sigdb_load_database(RZ_NONNULL const char *sigdb_
  * \return true if the signature entry was correctly added to the database, false otherwise
  */
 RZ_API bool rz_sign_sigdb_add_entry(RZ_NONNULL RzSigDb *db, RZ_NONNULL const RzSigDBEntry *entry) {
-	rz_return_val_if_fail(db && entry, NULL);
+	rz_return_val_if_fail(db && entry, false);
 	return ht_pu_insert(db->entries, entry, 1);
 }
 
@@ -182,7 +182,7 @@ static bool sigdb_move_entry(void *user, const void *k, const ut64 v) {
  * \return true if the databases were correctly merged, false otherwise
  */
 RZ_API bool rz_sign_sigdb_merge(RZ_NONNULL RzSigDb *db, RZ_NONNULL RzSigDb *db2) {
-	rz_return_val_if_fail(db && db2, NULL);
+	rz_return_val_if_fail(db && db2, false);
 	struct sigdb_move_data_t opt = {
 		.src = db2,
 		.dst = db,
diff --git a/librz/type/helpers.c b/librz/type/helpers.c
index 4d224022b2a..32d155adff1 100644
--- a/librz/type/helpers.c
+++ b/librz/type/helpers.c
@@ -196,7 +196,7 @@ RZ_API RZ_OWN RzType *rz_type_callable(RZ_NONNULL RZ_OWN RzCallable *callable) {
 RZ_API bool rz_type_atomic_eq(const RzTypeDB *typedb, RZ_NONNULL const RzType *typ1, RZ_NONNULL const RzType *typ2) {
 	// We aim to compare only atomic types, we can't compare more complex ones for now
 	rz_return_val_if_fail(typ1 && typ2, false);
-	rz_return_val_if_fail(typ1->kind == RZ_TYPE_KIND_IDENTIFIER && typ2 == RZ_TYPE_KIND_IDENTIFIER, false);
+	rz_return_val_if_fail(typ1->kind == RZ_TYPE_KIND_IDENTIFIER && typ2->kind == RZ_TYPE_KIND_IDENTIFIER, false);
 	rz_return_val_if_fail(typ1->identifier.kind == RZ_TYPE_IDENTIFIER_KIND_UNSPECIFIED, false);
 	rz_return_val_if_fail(typ2->identifier.kind == RZ_TYPE_IDENTIFIER_KIND_UNSPECIFIED, false);
 	rz_return_val_if_fail(typ1->identifier.name, false);
diff --git a/subprojects/rzar/ar.c b/subprojects/rzar/ar.c
index 3bb9e6325c3..451bdc99a69 100644
--- a/subprojects/rzar/ar.c
+++ b/subprojects/rzar/ar.c
@@ -393,7 +393,7 @@ RZ_API RzArFp *ar_open_file(const char *arname, int perm, const char *filename)
 		return NULL;
 	}
 
-	RzArFp *arf = arfp_new(b, NULL);
+	RzArFp *arf = arfp_new(b, false);
 	if (!arf) {
 		rz_buf_free(b);
 		return NULL;
diff --git a/test/unit/test_type.c b/test/unit/test_type.c
index 1779d9b3b9b..04bac8701cc 100644
--- a/test/unit/test_type.c
+++ b/test/unit/test_type.c
@@ -1118,13 +1118,13 @@ bool test_typedef_loop(void) {
 }
 
 static void struct_union_add_member(RzTypeDB *typedb, RzBaseType *btype, const char *member_name, RzType *member_type) {
-	if (btype->type == RZ_BASE_TYPE_KIND_STRUCT) {
+	if (btype->kind == RZ_BASE_TYPE_KIND_STRUCT) {
 		RzTypeStructMember *memb = rz_vector_push(&btype->struct_data.members, NULL);
 		memb->type = member_type;
 		memb->name = strdup(member_name);
 		memb->offset = 0;
 		memb->size = 0;
-	} else { // if (btype->type == RZ_BASE_TYPE_KIND_UNION)
+	} else { // if (btype->kind == RZ_BASE_TYPE_KIND_UNION)
 		RzTypeUnionMember *memb = rz_vector_push(&btype->union_data.members, NULL);
 		memb->type = member_type;
 		memb->name = strdup(member_name);