Add a link to a bug to a couple of FIXMEs