Fix a typo
Fix a wrong lib name
Merge branch 'develop'