Conform to latest netty