[FIX] Some minimal fixes.