Fix build; add timeout to collector