diff --git a/lib/src/space/grounding/index/trie.rs b/lib/src/space/grounding/index/trie.rs
index 43586ecd4..04d1c8d76 100644
--- a/lib/src/space/grounding/index/trie.rs
+++ b/lib/src/space/grounding/index/trie.rs
@@ -485,14 +485,16 @@ enum AtomMatchMode {
     Unification,
 }
 
-const TK_STORE_MASK: usize = 0b1 << 63;
-const TK_MATCH_MASK: usize = 0b1 << 62;
-const TK_VALUE_MASK: usize = !(0b11 << 62);
-
-const TK_STORE_HASH: usize = 0b0 << 63;
-const TK_STORE_INDEX: usize = 0b1 << 63;
-const TK_MATCH_EXACT: usize = 0b0 << 62;
-const TK_MATCH_CUSTOM: usize = 0b1 << 62;
+const BITS_PER_ID: u32 = usize::BITS - 2;
+
+const TK_STORE_MASK: usize = 0b10 << BITS_PER_ID;
+const TK_MATCH_MASK: usize = 0b01 << BITS_PER_ID;
+const TK_VALUE_MASK: usize = !(0b11 << BITS_PER_ID);
+
+const TK_STORE_HASH: usize = 0b00 << BITS_PER_ID;
+const TK_STORE_INDEX: usize = 0b10 << BITS_PER_ID;
+const TK_MATCH_EXACT: usize = 0b00 << BITS_PER_ID;
+const TK_MATCH_CUSTOM: usize = 0b01 << BITS_PER_ID;
 
 /// Compact representation of the atom from the trie. It represents each
 /// atom using single [usize] value. It keeps value of the key, key matching
diff --git a/python/install-hyperonc.sh b/python/install-hyperonc.sh
index 5c27cf052..e59b8f319 100755
--- a/python/install-hyperonc.sh
+++ b/python/install-hyperonc.sh
@@ -23,7 +23,7 @@ echo "hyperonc repository URL: $HYPERONC_URL"
 echo "hyperonc revision: $HYPERONC_REV"
 
 if test "$AUDITWHEEL_POLICY" = "manylinux2014"; then
-    yum install -y perl-devel openssl-devel zlib-devel
+    yum install -y perl-devel openssl-devel zlib-devel libatomic
 fi
 
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rustup.sh