Add fixes for broken eAPI