Minor findbugs violations fixed