Fix bugs from FindBugs
Use corrent double-check lazy initializer