Fix bugs found by findbugs
Merge branch 'master' of https://github.com/trendmicro/BEE