Healthd fixes