Bunch of pantheon updates