Fixing a few trivial issues identified by SpotBugs
3 files changed