Updates for newest NasExt/Forms