minor form fixes