resolving findbug spotted issues.