[FIX] a few fixes