fix: hash/binary mismatch for new CU structure holds CU-specific info
Resolve gcc warnings

* more parenthesis for macro
* changed signed to unsigned int