Fix function + signature generation