Changes to work with latest version of the run-time