correct some issues

correct some issues