More space breaking fixes.