Findbugs: minor corrections
Merge origin/master