[FIX]: fix small issues