Update to work with latest runtime-libaries.