fix some issues

fix some issues