Fixed Radar bugs from merge