Findbugs: different issues solved