A few fixes.