Some TODOs and asserts