Fixed a few more of the items on Dave's list.