Clean up some FIXMEs