Fix a couple of high priority findbugs issues.