Deathmax latest fixes