Fixes to Lease Controller