Make a few files match master to clean up diff slightly.