[FIX] various part