Fixes to radar scanning code