Changes for latest libraries.