Fix a couple findbugs problems.