Fixing more spy issues.