Fix Baseband issues on all recoveries