More cpp fixes.