Fixed findbug issues