API function calls corrections