Fix warning.
Fix some small TODOs.