Fixups to function wrappers.