Bug fixes in function calls.