More findbugs fixes
Change to use reference conn instead of client.connection
Merge pull request #485 from samarthjain/master

More findbugs fixes.