Added FIXMEs (and didn't repair, hehe)