-Fix findbugs issues