Fix broken function calls