Some more fun fixes.