Some OFDM fixes