Fixing those FIXMEs