fixed some Findbugs warnings