Fixed some FIXMEs