Fixes to work with streamhub-input.