small changes to get through sandbox tests as well as rc sandbox tests (local dev env)