Some changes to support running in cloud9.