Fixes for healthcheck and initialization