Apply changes to Spy-Seth pull request.