~WIP: Experimental server tweaks for unified channel API