Changes to support Gnuradio 3.7