Merge form fixes