availability form fixes