Change FIXMEs to TODOs. Actually they might not be an issue at all.