Fixing FindBugs issues