Update to work with new runtime-libraries and NaBL generator.