Change some old function syntax