Fix health and energy validation bug