Lots of tiny rewrites to make user/channel work