A few important fixes.