initial changes to work in Pantheon environment