Updated FIXME notes