Make spy actions work again