some spy fixes