End of Chapter Fixups