Fixed Findbugs issues. refs #435