statefull channel fixes