Fix up some more, new RSI format