eden more hotfixes