Issue #28: fixing some findbugs violations