Fix some issues due to missing _REG