leases & lease_stub updates