Fixed a few bugs, especially with EUNE.