A few small fixes
Merge pull request #2 from bmneely/final-todo-cleanup

A few small fixes