4.1.96: Modified some more API.