Fix some cases where SDR/SWR break.