Cleaned up a few spots based on github notes.