another cpp fixes