Some prep for netty 5 in this branch - harmless