FIXUP comments