Fixed typo
Fixed typo
Fixed some API issues