Fixed some leasing bugs