Bug fixes in loan and return #2