Updated for latest runtime-libraries