Fix function calls