Changes for changes in rdlib