Update to work with latest runtime-libraries.