[FIX]: fix some issues