Fixes in cluster and startup checks