Adding a TODO for myself.
Cleaning up some warnings.