Add some TODOs and FIXMEs