Fix function returns.