Fix findbug and test error