Fix for findbugs issues.