[FIX] minor fixes.