More fixes #NWHealthHack