4 Commits (EDS-Fixes)