Fixes for DE2