Application form fixes