Some more extractor fixes and debug messages.