emit-form fixes