add 2 more FIXME statements

- and the bugs just keep on coming…