Fix fallout from tech-capture changes
Merge pull request #5762 from obrakmann/fix-tech-capture-fallout

Fix fallout from tech-capture changes