[FIX] Minor fixes.