More fixes to health fixes...