Two more vars moved to private