Adapt to latest PIP Zap changes