Fix bugs
Merge pull request #1589 from pandamicro/develop-3.0

Fix bugs