Couple of fixes for receive scan