Correct some minor bug
Fix some minor bug