P2P: Consider channel optimizations for additional cases