Fix function expressions