Resolve health issues

0