diff --git a/src/tree_data.c b/src/tree_data.c
index e416666..9380fe6 100644
--- a/src/tree_data.c
+++ b/src/tree_data.c
@@ -3412,7 +3412,7 @@
 
     /* data instances are ordered, so we can stop when we found instance of other schema node */
     for (iter = instance; iter->schema == instance->schema; iter = iter->prev) {
-        if (pos && iter->next == NULL) {
+        if (pos && (iter->next == NULL)) {
             /* overrun to the end of the siblings list */
             break;
         }
@@ -3435,7 +3435,7 @@
     if (node->parent) {
         start = node->parent->child;
     } else {
-        for (start = (struct lyd_node *)node; start->prev->next; start = start->prev);
+        for (start = (struct lyd_node *)node; start->prev->next; start = start->prev) {}
     }
 
     return start;