Modernize a couple of interop forms