Miscellaneous fixes to the user streams branch

This isn't ready to merge yet — I have a few more fixes to push.