Swapping PC's, just some crash fixes.