diff --git a/include/cpam/augmented_node.h b/include/cpam/augmented_node.h
index e58cd14..dcf95c6 100644
--- a/include/cpam/augmented_node.h
+++ b/include/cpam/augmented_node.h
@@ -160,13 +160,13 @@ struct aug_node : public basic_node<balance,
   template<typename F>
   static void iterate_seq(node* a, const F& f) {
     if (!a) return;
-    if (basic::is_regular(a)) {
-      auto r = basic::cast_to_regular(a);
+    if (is_regular(a)) {
+      auto r = cast_to_regular(a);
       iterate_seq(r->lc, f);
       f(get_entry(r));
       iterate_seq(r->rc, f);
     } else {
-      auto c = basic::cast_to_compressed(a);
+      auto c = cast_to_compressed(a);
       uint8_t* data_start = (((uint8_t*)c) + sizeof(aug_compressed_node));
       AugEntryEncoder::decode(data_start, c->s, f);
     }
diff --git a/include/cpam/basic_node.h b/include/cpam/basic_node.h
index 1701ebc..b88a26b 100644
--- a/include/cpam/basic_node.h
+++ b/include/cpam/basic_node.h
@@ -193,7 +193,7 @@ struct basic_node {
     assert(s <= 2*B);
 
     size_t encoded_size = EntryEncoder::encoded_size(e, s);
-    size_t node_size = 3*sizeof(node_size_t) + encoded_size;
+    size_t node_size = sizeof(compressed_node) + encoded_size;
     compressed_node* c_node = (compressed_node*)utils::new_array_no_init<uint8_t>(node_size);
     //compressed_node* c_node = (compressed_node*)complex_allocator::alloc();
 
@@ -201,7 +201,7 @@ struct basic_node {
     c_node->s = s;
     c_node->size_in_bytes = node_size;
 
-    uint8_t* encoded_data = (((uint8_t*)c_node) + 3*sizeof(node_size_t));
+    uint8_t* encoded_data = (((uint8_t*)c_node) + sizeof(compressed_node));
     EntryEncoder::encode(e, s, encoded_data);
 
     check_compressed_node(c_node);