Fixes for upgrading to CZMQ 2.2.0