Eureka compat issues, removed