fixing findbugs warnings