Fix patches system to support multiple versions of ZS per patch