Fix function sigs