[FIX]: small fixes