Radar master build fixes