Some other fixes related to the viewer count.