Health/Shield system tweaks and fixes