Function call fixes.