CONN-185: Fixed rest of the minor findbugs issues