Fix following FindBugs analysis and Upgrade and SSL fix