Get rid of 3 more FIXMEs.