Availability minor fixes