Various fixes in spy section.