Some changes to ensure lease is run correctly and updates to the lease store