Fix signature issues with Supply.(zip|merge)