Public and private corrections, warned about by icc (#304).