more DE-fixes
Merge pull request #305 from hurzl/master

more DE fixes