Add the last of the changes from r98