Address various warnings from findBug.