[FIX] Minor bug fixes.