Remove some api bugs due to lib version change