Deal reached on farm reform / Spying inquiry