More refinements in status checks