Pantheon updates and clean-ups