Fix some bugs after merge develop/testValidator