Fixes for buildhealth.cli.jar