This change to the patch above fixes the game. I was able to play many games and it runs better than the 23 alpha. However the tests segfault so I disabled them. Christopher said he doesn't have time for this at the moment, could a reviewer rebase this change on and test it? thanks.