Committing a couple of bugs for FindBugs..