Fixed a couple of problems pointed by findbugs