Core-wax code adjusted to signature type changes done in Hived submodule