Updating with librand changes