Further meta improvements