Fixed FIXMEs