fixed findbug reported bugs