CONN-650: updates for some findbugs findings.