Fixed some usage of old contrib libraries.