Additional tweaks to log streaming logic