Bug fixes in DE integration