Adjustments for hive unavailability condition