More pantheon fixes