Minor fixes in spy mode.