Integrating small changes from usrp prep code