Ofdm fixes

Mostly found by Bastian, fixed by us both.
Goes on master because there are some minor behaviour changes.