Fixed more minor details to solve findbug errors.