Miscellaneous fixes to the user streams branch#84

tonyarnold wants to merge 2 commits intojoeldev:user-streamsjoeldev/ADNKit:user-streamsfrom

tonyarnold:user-streams-fixestonyarnold/ADNKit:user-streams-fixesCopy head branch name to clipboard