Fixing more of deathrat's mistakes