FIX: minor fixes.