Some improvements to resist a little more when in danger