Use the right UUID to track channels, move verbose channel logging to TRACE
fix merge conflict