Added more missing lifetime annotations