Rent/Return fixes