Fixed fixable Findbugs issues. refs #382