Minor fixes.
Fix function types.