[FIX] Misc fixes.