Fixed issues on api references