Close up some FIXMEs