Fixed some TODOs and FIXMEs