A few final cleanup changes from the final presentation.