Fixes for Common RF 1+2