Fix for DVB-T2

And some small adaptions