More fixes.
spy stuff.