Mostly spy fixes.