More space fixes.