Fixes for eggplant runner