Fix findbugs issues