fix headers for functional visitors