Add FIXME comments from J. Comp. Sci. peer review