More fixes for spy