Bugfixes for new ETS version