[FIX] small fixes