fix some more crashes in mafia