Fix java warning and Findbugs