* More META fixes