add fixes for avail on cal