Fixes some small TODOs