Change references to local=false