FRV: Fix interaction with new generic header stuff