Various pantheon-related updates