Make it compile with latest ZK-7.0.0 Freshly build