Ming Jin: fix some issues