availability fixes