Fix for latest Pyre and pyZOCP developments