Adjust for last API modification.
Match last API modifications.