Some fixes for DE detection.