Desiree/Steven/Pamela: fixes issues with the port to run locally