Crash fixes.
Closer to getting the RS to work.