Fix DE and main