Purity: upstream updates