Updating for use with newer libs.