Fixed survival issues