Some strageness going on with the stream overlay.

This seems to fix most of it, will have to investigate further...