Enhancements to the channel upgrade handler