Working through streaming issues