changes to support running locally without vm