Fix warnings
Merge branch 'dev' of https://github.com/XintongProjects/FBTest into dev