Added Health checks
Fix to get working build