Couple fixes to spy calculations.