Fix up new func.c code