Fixes to health fixes