School form fixes