Updates and corrections for new libraries.