Changes to make Native and Managed work.