Finished form fixes.