Updating some references that had drifted out of working