Saving and borrowing fixes