Fix incorrect lifetimes on borrow structures