Fixed build and updated code to account for changes in stream client