Fix some findbugs issues.