make final / remove findbugs warnings