DE issues fixes