Fixed calls to removed functions.