Fixed some API issues.