Small modal form fixes