Update build and fix race in eureka