Move some FIXMEs/TODOs about