Fixed a couple of findbugs issues.